Fix some controller bugs

Fix some controller bugs