Minor adjustments of settings