bug 942314 - small nit fixes