Fixup for Store submission.