Various storage page fixes