Small fixes across different controller.