More atom fixes