Make the build happier under Linux
More linux fixes