Fix issues with defaults.