Fixes from SensioInsights