Updates to help track down bug 402008