Relax some unnecessarily tight constraints