Small grep improvements