Changes for linux