Fix some detections