backport some more of the admindocs fix