Fixing minor regressions