fix bundles and storage