More fixes wrt. older MSVC.