Tier 3: fix builds