Fixes to improve SensioInsights score