Small bug fixes to master crawl