Warning fixes from bad merge.