fix regressions from earlier commits