Fix some stuff in controller (but not all)