stuff i forgot to commit yesterday: changes for bug 808370 and a new patch for bug 846606