Improvements to storm integration & fixing build