Small changes to defaults