Fix some UML problems