More windows compilation fixes