Fixes for SL Insight