Further reachability fixes.