Small OCCI-OS compatibility fixes
Merge pull request #8 from arax/occi_os_compat

Small OCCI-OS compatibility fixes