Fixed movement issues