Fix scrutinizer and SensioLabsInsight major issues. refs #54