Readding grep 2.18 and script fixes