Class Diagram - small fixes