Minor fixes post-merge

Just fixing up a few things that broke with the merge.