a few fixes for regressions