fix regressions from my previous checking, including