Changes for windows compilation