Windows header fixes (very minor)