Followup for bug 1041225 and bug 1041158, fix a couple of typos, r=rcampbell