Fixes compilation issues on Linux
Merge pull request #5102 from ricardoquesada/compile_fixes

Fixes compilation issues on Linux