Fixed more constraints