Minor adjustments to what is already there