More code towards support non-atomic stores