More linux compatibility changes