Fixes for crawl-speed and logger issues