JOHNE - Additions needed for building with MSVC