Compilation issues on Windows fixed