more diagram fixes