Debug improvements
Optimizations and fixes for large suites