Changes required for VS2013 compatibility