A couple of minor changes; no major functional change