More changes for building in linux