Split several constraints into BC/AC versions
Various debugging/improvements