Small performance changes in controllers