Fixed store errors