minor fixes for setting default option