Bug 951407 - Fix two hazards introduced by bug 951282; r=sfink