A few more changes for linux