Fix user input issues