Minor changes to get it to compile on windows