Bugfixes in OCCI plugin and code improvements