Small modifications during initialization of the controller