Fixes from SensioLabsInsight tips