Caught a couple controller bugs