Fixed some constraints