diff --git a/net-p2p/feather/feather-2.1.2.ebuild b/net-p2p/feather/feather-2.1.2.ebuild
index 697aca1eb4..1678afc9e2 100644
--- a/net-p2p/feather/feather-2.1.2.ebuild
+++ b/net-p2p/feather/feather-2.1.2.ebuild
@@ -98,9 +98,9 @@ src_prepare() {
 	default
 	echo "#define FEATHER_VERSION \"${PV}\"" > "${WORKDIR}"/${PF}/src/config-feather.h || die
 	echo "#define TOR_VERSION \"NOT_EMBEDDED\"" >> "${WORKDIR}"/${PF}/src/config-feather.h || die
-	pushd monero
+	pushd monero || die
 		eapply "${FILESDIR}"/monero_add_some_includes.patch
-	popd
+	popd || die
 	cmake_src_prepare
 }
 
diff --git a/net-p2p/p2pool/p2pool-2.6-r1.ebuild b/net-p2p/p2pool/p2pool-2.6-r1.ebuild
index 960bce71a7..4d2e93547b 100644
--- a/net-p2p/p2pool/p2pool-2.6-r1.ebuild
+++ b/net-p2p/p2pool/p2pool-2.6-r1.ebuild
@@ -71,7 +71,6 @@ src_prepare() {
 
 	# Stop their script from overriding flags:
 	cp "${FILESDIR}"/flags.cmake cmake/flags.cmake || die
-	die
 
 	cmake_src_prepare
 }