More store fixes