A few things that I missed in the last commit