Controller fixes on debugging