Slight diagram size improvements