Fixes from John Dyson: