BUGFIX: fix remaining calls to tier_type()