Fixing compiler warnings and cl dependency