some constraint change crash fixes