[BUGFIX] Some fixes for controller stuff