Security changes for WIR_OCR class