fix remaining constraints