Tightened up some requirements.