Minor fixes now tested and running without storage handler.