Some changes necessary to get things working on linux.