Several minor fixes.
Particularly to the UDT -> simple plugin conversion
and to handling pages that use DM templates