More ATOM fixes