More movement issues fixed