Initial batch of nit fixing