Forgot a few vars in places.