CQM-111 Further code review fixes