And now some self-nit fixing