Fix shell script error
Fix OC7 errors

see #241