Bug fixes for storm module