More OCR Bug Fixes