Fixes for MSVC++ 11.0