Fixed some controller issues.