Small, but important, fixes

I did nothing, SensioLabsInsight did the hard work ;)