fixes storage to work with new dart apis
Merge branch 'fix_small_issues'