Fixed issues according to SensioLabsInsight #3