Forgot a few things with the last commit