More bug fixes regarding the Controllers