bug 859573 - followup fixes. r=bustage