Crawler fixes