Fix catalyst 3xxx inheritance + setTrunkMode