Controller fixes and updates