Fixing controller issues