Added a few things for Store. Atempt to fix production DB problems