Some fixes with input line