Correct two problems, found by Martin Kochanski <cardbox@easynet.co.uk>: