Repaired build under linux