Some changes for new Linux setup