Fixed controller issues.