Two small changes to fix compilation with MSVC