Tier 3: various fixes
Base: various fixes