Minor adjustments of default parameters