Chg: Minor code stabilisations