Small OSL fixes.
Merge pull request #494 from est77/OSL

Small OSL fixes.