Dgrep major bujfixes