Minor fixes from mfschwartz.