Fix a few more regressions