More fixes around storage apis