new patches for bugs 855180 and 874635. updated patch for bug 874061 (forgot to commit some of yesterday's work)