CHG: Minor Improvements