Fixes for SensioInsight#1