Fixes for MSVC 2013
Fixes for MSVC