Few more constraint changes