diff --git a/dev-libs/nfd/nfd-1.0.recipe b/dev-libs/nfd/nfd-1.0.recipe
index ad96e23c6..10cae609f 100644
--- a/dev-libs/nfd/nfd-1.0.recipe
+++ b/dev-libs/nfd/nfd-1.0.recipe
@@ -9,7 +9,7 @@ SOURCE_URI="https://github.com/puckipedia/nativefiledialog/archive/39ecf6a1.zip"
 CHECKSUM_SHA256="6c4eff1c0d5f2d3165192710cb1c844ec9e63d4fe7c4e2238cf5c6ddcb0da648"
 SOURCE_DIR="nativefiledialog-39ecf6a1d8c8cfa3a6f1c6795765911245809833"
 
-ARCHITECTURES="x86_gcc2 ?x86 x86_64"
+ARCHITECTURES="x86_gcc2 x86 x86_64"
 
 PROVIDES="
 	nfd = $portVersion
diff --git a/net-im/qutim/qutim-0.3.3.recipe b/net-im/qutim/qutim-0.3.3.recipe
index 2f646479d..cfe9d4619 100644
--- a/net-im/qutim/qutim-0.3.3.recipe
+++ b/net-im/qutim/qutim-0.3.3.recipe
@@ -33,7 +33,7 @@ PATCHES="qutim_x86-0.3.3.patchset"
 PATCHES_3="xdg.patchset"
 ADDITIONAL_FILES="qutim.rdef"
 
-ARCHITECTURES="!x86_gcc2 ?x86 x86_64"
+ARCHITECTURES="!x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="x86 !x86_gcc2"
 
 PROVIDES="
diff --git a/sci-mathematics/octave/octave-4.2.1.recipe b/sci-mathematics/octave/octave-4.2.1.recipe
index 4bf6b0a8b..ce8942028 100644
--- a/sci-mathematics/octave/octave-4.2.1.recipe
+++ b/sci-mathematics/octave/octave-4.2.1.recipe
@@ -10,7 +10,7 @@ SOURCE_URI="https://ftp.gnu.org/gnu/octave/octave-$portVersion.tar.gz"
 CHECKSUM_SHA256="80c28f6398576b50faca0e602defb9598d6f7308b0903724442c2a35a605333b"
 PATCHES="octave-$portVersion.patchset"
 
-ARCHITECTURES="!x86_gcc2 ?x86 x86_64"
+ARCHITECTURES="!x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="?x86"
 
 PROVIDES="
@@ -80,7 +80,7 @@ BUILD_REQUIRES="
 	"
 BUILD_PREREQUIRES="
 	cmd:awk
-	cmd:bison
+	cmd:bison >= 3
 	cmd:find
 	#cmd:flex
 	cmd:gfortran$secondaryArchSuffix
diff --git a/sci-visualization/gnuplot/gnuplot-5.0.6.recipe b/sci-visualization/gnuplot/gnuplot-5.0.6.recipe
index e08da355f..435a0a9b5 100644
--- a/sci-visualization/gnuplot/gnuplot-5.0.6.recipe
+++ b/sci-visualization/gnuplot/gnuplot-5.0.6.recipe
@@ -10,7 +10,7 @@ REVISION="1"
 SOURCE_URI="http://downloads.sourceforge.net/gnuplot/gnuplot-$portVersion.tar.gz"
 CHECKSUM_SHA256="5bbe4713e555c2e103b7d4ffd45fca69551fff09cf5c3f9cb17428aaacc9b460"
 
-ARCHITECTURES="!x86_gcc2 ?x86 x86_64"
+ARCHITECTURES="!x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="x86"
 
 PROVIDES="