Fixed compile errors on windows for fix to #3