internal fixes