Fixes from CHP