Fix issues with new defaults
3 files changed