more tweaks (cast to the right type)