More fixes in response to bent's review.