Some more fine-tuning to run regression test suite