Fixed more entity moving issues