DAR-120 code review fixes