Fix for issue #25, CM conversion adds params not in original model, clean up warning messages