constraints fixes