Update the default values to be more consistent