storm fixes

see comment at #1047