Bug 10862: (follow-up) fix a couple of issues