Fixes for windows compilation