Fixups for STORE commit