Bug fixes for new storm file format