Fixes for MSVC 2013