More changes for linux compat