Partially fixed issues reported by Insight