Fix for Linux
Handling warnings: for OCL > 1.1 and for OCL on Linux
Removed unused vars, cleaning up