Some fixes to Chain.1