some changes for linux compat