Fix more Rubocop errors