Fixes in storage and CMake