Fixing a few constraints