Mods to ensure that tags and UUID control work properly.