Bug fixes to atomic logic