Fix minor problems reported by SensioLabs Insight