Small changes for linux