Fixed some issues requiring more constraints