diff --git a/recipes-asterisk/asterisk/asterisk_13.5.0.bb b/recipes-asterisk/asterisk/asterisk_13.5.0.bb
index ff71607..c912b3d 100644
--- a/recipes-asterisk/asterisk/asterisk_13.5.0.bb
+++ b/recipes-asterisk/asterisk/asterisk_13.5.0.bb
@@ -17,10 +17,7 @@
 
 S = "${WORKDIR}/asterisk-${PV}"
 
-inherit autotools pkgconfig useradd update-rc.d
-
-# dora doesn't have autotools-brokensep. Still needed for sysmocom
-B = "${S}"
+inherit autotools-brokensep pkgconfig useradd update-rc.d
 
 USERADD_PACKAGES = "${PN}"
 USERADD_PARAM_${PN} = "--system -g asterisk --shell /bin/false asterisk"
diff --git a/recipes-isdn/dahdi-tools/dahdi-tools_2.10.2.bb b/recipes-isdn/dahdi-tools/dahdi-tools_2.10.2.bb
index 7dec897..337186d 100644
--- a/recipes-isdn/dahdi-tools/dahdi-tools_2.10.2.bb
+++ b/recipes-isdn/dahdi-tools/dahdi-tools_2.10.2.bb
@@ -21,9 +21,7 @@
 
 S = "${WORKDIR}/${PN}-${PV}"
 
-inherit autotools pkgconfig perlnative cpan-base update-rc.d
-# dora doesn't have autotools-brokensep. Still needed for sysmocom
-B = "${S}"
+inherit autotools-brokensep pkgconfig perlnative cpan-base update-rc.d
 
 export DAHDI_PERLLIBDIR="${PERLLIBDIRS}/${@get_perl_version(d)}"
 
diff --git a/recipes-osmocom/meta/meta-toolchain-osmo.bb b/recipes-osmocom/meta/meta-toolchain-osmo.bb
index 0350005..a8dc39d 100644
--- a/recipes-osmocom/meta/meta-toolchain-osmo.bb
+++ b/recipes-osmocom/meta/meta-toolchain-osmo.bb
@@ -13,12 +13,7 @@
 
 
 create_symlink() {
-        # master or dora?
-        if [ -e ${SDKDEPLOYDIR}/${TOOLCHAIN_OUTPUTNAME}.sh ]; then
-                cd ${SDKDEPLOYDIR}/
-        else
-                cd ${SDK_DEPLOY}/
-        fi
+        cd ${SDKDEPLOYDIR}/
 
         rm -f ${TOOLCHAIN_OUTPUT_BASENAME}.sh
         ln -s ${TOOLCHAIN_OUTPUTNAME}.sh ${TOOLCHAIN_OUTPUT_BASENAME}.sh