Fix tier checks