Edits to compile on Windows