Win compile fixes