Fixing bad paths and double-import of Microsoft.Bcl.Build