Adapted some configurations back to Linux... now working on OSX and Debian