controller bugfixes