Fix moved references