Various OSCFuncs should be 'fix'-ed

Signed-off-by: Scott Wilson <i@scottwilson.ca>