Fix overlaps.

The locations for the S/M wire frames are not yet correct.