Fixes related to VS2012 upate 3 again