Fixup storm code