Small changes to make it work with MSVC.