VS2013 specific fixes