Fixing a few controller issues