Some fixes for MSVC 14 CTP 2.