fix core, storage