More fixing up of diagrams.