Minor edits to avoid namespace clashes and fix windows builds