A couple minor cleanups.