Minor updates for UML