Further atomicity fixes