Fix application of default values to options