Storm Fixes