Fixed regressions from bad merge.