Small Bugfixes for the Controller