More ATOM fixes.