Some changes made on Linux