More entity movement bug fixes