Additional tier fixes