Further updates for VS2013 support.