CHG: Small improvements