Diagram fixup