Minor changes per last SensioInsight analysis