ATDAQCCRM-47 ATDAQCCRM-54 Minor changes following cppcheck recommendations