Typo fixes, from BZ 1075417