Moved a couple controller issues around