more fixes from Guy Harris