[MOD] Storage: minor speed ups