Further fixes to the BCE scripts