fix other issues reported by insight