Minor fixes to ATOM? and COMPOSITE?