fix issues reported by inspection, cont.