fix a couple problems with the last patch picked up by Michael Hudson