Some changes to defaults