"Move to" bugfixes and improvements