Fixes for Visual Studio 2013