Fix a couple of more regressions