Move fixes as a result from changes to GTGUI.