Fixed various autocontraint errors