fix grid and input controller issues