Crawler Fixes