Fixes to storm announcement