Fix some store bugs.