Add fallbacks for new partition identifiers