Minor fixings about entity movement: