Corrected some issues found by SensioLabs Insights