minor controller related changes