Bunch of stuff I missed in the last commit