Controller fixes