Forgot some things in last commit (oops)