Fix more broken reachibility checks