bug 689615 - small nit fixes