Bunch of miscellaneous changes I forgot to commit.