Merge alt-partition changes, mostly minor tweaks