Some changes in general config