diff --git a/meta/classes/distrodata.bbclass b/meta/classes/distrodata.bbclass
index 907f78dc1c..be95b1ce38 100644
--- a/meta/classes/distrodata.bbclass
+++ b/meta/classes/distrodata.bbclass
@@ -190,6 +190,7 @@ python do_distrodata() {
 
 addtask distrodataall after do_distrodata
 do_distrodataall[recrdeptask] = "do_distrodataall do_distrodata"
+do_distrodataall[recideptask] = "do_${BB_DEFAULT_TASK}"
 do_distrodataall[nostamp] = "1"
 do_distrodataall() {
         :
@@ -787,6 +788,7 @@ python do_checkpkg() {
 
 addtask checkpkgall after do_checkpkg
 do_checkpkgall[recrdeptask] = "do_checkpkgall do_checkpkg"
+do_checkpkgall[recideptask] = "do_${BB_DEFAULT_TASK}"
 do_checkpkgall[nostamp] = "1"
 do_checkpkgall() {
         :
@@ -829,6 +831,7 @@ python do_distro_check() {
 
 addtask distro_checkall after do_distro_check
 do_distro_checkall[recrdeptask] = "do_distro_checkall do_distro_check"
+do_distro_checkall[recideptask] = "do_${BB_DEFAULT_TASK}"
 do_distro_checkall[nostamp] = "1"
 do_distro_checkall() {
         :
@@ -877,6 +880,7 @@ python do_checklicense() {
 
 addtask checklicenseall after do_checklicense
 do_checklicenseall[recrdeptask] = "do_checklicenseall do_checklicense"
+do_checklicenseall[recideptask] = "do_${BB_DEFAULT_TASK}"
 do_checklicenseall[nostamp] = "1"
 do_checklicenseall() {
         :
diff --git a/meta/classes/prexport.bbclass b/meta/classes/prexport.bbclass
index 16c4bf2f23..5a1cb33c6a 100644
--- a/meta/classes/prexport.bbclass
+++ b/meta/classes/prexport.bbclass
@@ -55,4 +55,4 @@ python prexport_handler () {
 }
 
 addhandler prexport_handler
-prexport_handler bb.event.RecipeParsed bb.event.ParseStarted bb.event.ParseCompleted"
+prexport_handler[eventmask] = "bb.event.RecipeParsed bb.event.ParseStarted bb.event.ParseCompleted"
diff --git a/meta/classes/utility-tasks.bbclass b/meta/classes/utility-tasks.bbclass
index bb26eb7e7e..507e0f1c94 100644
--- a/meta/classes/utility-tasks.bbclass
+++ b/meta/classes/utility-tasks.bbclass
@@ -48,6 +48,7 @@ python do_checkuri() {
 
 addtask checkuriall after do_checkuri
 do_checkuriall[recrdeptask] = "do_checkuriall do_checkuri"
+do_checkuriall[recideptask] = "do_${BB_DEFAULT_TASK}"
 do_checkuriall[nostamp] = "1"
 do_checkuriall() {
 	:
@@ -55,6 +56,7 @@ do_checkuriall() {
 
 addtask fetchall after do_fetch
 do_fetchall[recrdeptask] = "do_fetchall do_fetch"
+do_fetchall[recideptask] = "do_${BB_DEFAULT_TASK}"
 do_fetchall() {
 	:
 }