Fix regressions from lib updates.