Next attempt for trying to fix the Linux/OSX build