Some stuff seems to have wrong fd checks, so here’s a diff.