Fix some moving issues