Typhoon-related updates

Comments