Fix more  id retrievals