Fixing a regression; performance improvements
Fixing regressions