Fixed movement bugs