Some more fixes for Store