Fix list comprehension and clean keys for atomic object ops