Fixed a few constraint issues