minor fixes for storage