cmsj More constraint tweaks

Latest commit cf9cd81

May 7, 2019