Fix new Rubocop warnings