Fix more rubocop errors