Fix stuff suggested by SensioLabs Insight