A couple of fixes requested by David A.