Fixed some binops and string detections