This patch corrects a little glitch and two outright errors.

(Including one reported earlier by Thomas Wouters.)