Some movement fixes