Address bug 2666, references to other problems.