Fix regressions and chromie problems from 59576b2