Fix a few regressions introduced in a previous commit