Fixed more reachability bugs