atomic unset fixes