Add missing options and defaults.