Some more tweaks for right types