Forgot a few pieces in previous commit