more bug fixes in the changes for bug 843004