more work for bug 843004. landed the patches for bugs 935277, 943496