Fix issues found by SensioLabsInsight

Fix for missing changes in some controllers