Address issues reported by Irene Ruengeler.