Some controller input fixes