work for bug 760876: style and behavior fixes