Fixed some controller/keyboard input functionality