First batch of modifications for OCR 0.9 compliance