Fixes from SensioLabsInsight