Some changes in default values