Disklabel separation work - Generally shift all disklabel-specific