Fixed controller issues