Forgot some minor things in last commit