Fixed constraint errors again