fixes suggested by David F.