Minor changes for linux