Move Option fixes