Fix issues reported by new rubocop