more work on bugs 808370 and 783499