Fixed problems reported by inspection program