[Insight] fixes #3 and #4