More diagram fixes.