GitLab

Minor fixes to some recent changes that prevented compilation (Mark looked at these). This code still has never been tested, at least on Windows.