Speed up recoverable errors
Build the storer
Fixes for integration tests