User input related quick fixes