Fix Constraints Issues