Ticket #2119: some trivial corrections.