Fix some issues reported by scrutinizer-ci