Forgot a few contraints
Merge pull request #725 from Gravecorp/3.1.x.x

Forgot a few contraints