Fix more rubocop warnings