More regressions were fixed, a few other changes for the next release