Add changes suggested by abartlet: