Thanks for the tip and link nevw. I believe I've fixed the errors in this changeset: https://www.openstreetmap.org/changeset/139114228

I've still got some more ungluing to do around the industrial area.