Fixes for insight