Build fixes MSVC11 r65