A couple minor bug fixes.