Correct some issues throw by Insight