Some crawler fixes