Tightening up a few things