Fixing ATDAQCCEFF-17 and ATDAQCCEFF-15.