UML: Fix some apparent bitrot