minor regressions fixed