Added missing typhoon checks.