Second round of improved defaults
2 files changed