Fixed and added improvements from SensioLabsInsight