More Atom tweaks