Fixing two sloppy mistakes from a bad rebase.