Fix build and fat fingers on merge.