Fix a couple of regressions