Fixes suggested by SensioLabsInsight :)