More fixes
more regressions fixed