Some more movement issues fixed