Minor changes to storage package