Fix a couple of defects noted by joel@.