XX-11179:  Minor adjustments after code review