minor fixes for the merged commits

No match.