More OCR fixes