Some changes on linux