Small fixes to input io