Continued work on bug 1073732
Correct bug references