Fix for MSVC 2013 update 3 errors