Further nit picks