Linux fixes
Satisfy cl.exe dependencies