Bug fixes for setting up default values.