fixing storm integration issues