Fix some small things broken with the last merge.