Fix controller refs and some key repeats