Some minor refinements/fixes

No match.