Probably fix for 2806.

Also, some doc additions.