Win compilation fixes

subj.