Minor store fixes.