UML + minor erase fixes