fixes for bug 808370