More solution changes for VS2013 compile