Fixed a few subtle bugs, as yet unexposed by real use, according to
review by Emilio Cota.
Signed-off-by: Alessandro Rubini <rubini@gnudd.com>