fixes for linux
Merge pull request #5600 from ricardoquesada/setup_fixes

fixes for linux