Fixed controller bugs