Minor changes needed for Storm 0.7.0