Fixing stuff with the storage backend. No idea if this is working.