Fix synchronized store bugs