Fixes from last set, with the exception of the hardcoded "Xen" issue. That will be fixed as part of the larger effort eliminate all hardcoded prefixes. Fixes are detailed per patch.