Also try to comment all legacy macro at the and of ocilib.h and eliminate few compilation...
Typo and bug in collection elements handling