Fix some tips reported by SensioInsight