fixes to atomic updates