Further refine UML.
Fix build.