Fix bootstrap and #near_threshold