Bug 915354 - A few follow-on fixes;r=me