Visibility and crawler fixes