fixed minor regressions