General bug fixes for user input interface