Fixed controller bugs.