More fixes for atomic