Some fixes for Mr. Jenkins' complaints.