More work on getting build under linux