Minor changes to cpi.ml