more fixes for bug 587757