Diagram fixes