Add correct defaults.