Changes for linux compat