Two storage script fixes