Fixed errors due to merging OCR interfaces. You can pull now!