ucm.xml changes and couple notices