Corrected workspace.xml and other merge fuck-ups