ATMO-9236: tweaks based on review of files.