Fixes to input