bug 940994 - follow-up to fix some issues that were missed in review r=mmc