More nit fixes.