Some more Linux compatibility changes.