Cook 2127: Switch to platform_family and fix mode defs