Address issues reported by Bary Dingle.