Few more changes for linux