diff --git a/Makefile b/Makefile
index fdbd37525..03dfd77ce 100644
--- a/Makefile
+++ b/Makefile
@@ -23,7 +23,7 @@ all: $(BIN) $(PLAYER)
 $(SRC): nnn.h
 
 $(BIN): $(SRC)
-	$(CC) -O3 -fno-tree-loop-vectorize $(CFLAGS) -o $@ $^ $(LDFLAGS) $(LDLIBS)
+	$(CC) -O2 $(CFLAGS) -o $@ $^ $(LDFLAGS) $(LDLIBS)
 	strip $@
 
 debug: $(SRC)
diff --git a/nnn.c b/nnn.c
index e4674012d..0b817efcf 100644
--- a/nnn.c
+++ b/nnn.c
@@ -1182,10 +1182,12 @@ parsebmstr(char *bms)
 static char *
 get_bm_loc(char *key, char *buf)
 {
+	int r;
+
 	if (!key || !key[0])
 		return NULL;
 
-	for (int r = 0; bookmark[r].key && r < BM_MAX; ++r) {
+	for (r = 0; bookmark[r].key && r < BM_MAX; ++r) {
 		if (xstrcmp(bookmark[r].key, key) == 0) {
 			if (bookmark[r].loc[0] == '~') {
 				char *home = getenv("HOME");
diff --git a/packagecore.yaml b/packagecore.yaml
index 239b92e43..7b861fb88 100644
--- a/packagecore.yaml
+++ b/packagecore.yaml
@@ -48,16 +48,16 @@ packages:
     deps:
       - ncurses
       - readline
-  opensuse42.3:
-    builddeps:
-      - make
-      - gcc
-      - pkg-config
-      - ncurses-devel
-      - readline-devel
-    deps:
-      - ncurses
-      - readline
+#  opensuse42.3:
+#    builddeps:
+#      - make
+#      - gcc
+#      - pkg-config
+#      - ncurses-devel
+#      - readline-devel
+#    deps:
+#      - ncurses
+#      - readline
   ubuntu16.04:
     builddeps:
       - make