Make some updates more race-proof for api