Further compile fixes for win