1.0.6.18: Two fixes from Eric Marsden