Attempt to make everything compile again under g++ on Linux