Fix bugs in startup & stopping code for storm.