More entity movement fixes.