Bug fixes with controller input