Minor fixes, disable grep supplanted by ag.