diff --git a/engine/optics.c b/engine/optics.c
index 1c47092..195fcf1 100644
--- a/engine/optics.c
+++ b/engine/optics.c
@@ -949,7 +949,10 @@ guess_eye_space(int pos, int effective_eyesize, int margins,
 {
   if (effective_eyesize > 3) {
     set_eyevalue(value, 2, 2, 2, 2);
-    *pessimistic_min = 1;
+    if (margins > 0)
+      *pessimistic_min = 1;
+    else
+      *pessimistic_min = 2;
 
     if ((margins == 0 && effective_eyesize > 7)
 	|| (margins > 0 && effective_eyesize > 9)) {
diff --git a/patterns/eyes.db b/patterns/eyes.db
index ba5b83f..fdd73d7 100644
--- a/patterns/eyes.db
+++ b/patterns/eyes.db
@@ -298,12 +298,19 @@ Pattern 340
 Pattern 4000
 # Bent four in the corner. An attack depends on a ko and sufficiently
 # few outer liberties.
+# FIXME: Temporary workaround. With sufficient outer liberties it is
+# 
+# |.
+# |.<.
+# +---
+# 
+# :1222
 
 |.
-|.<.
+|.*.
 +---
 
-:1222
+:1122
 
 
 Pattern 4001
@@ -790,23 +797,39 @@ Pattern 5002
 
 
 Pattern 5003
+# FIXME: Temporary workaround. With sufficient outer liberties it is
+# 
+# |.
+# |X
+# |.XX
+# +---
+# 
+# :2222
 
 |.
 |X
 |.XX
 +---
 
-:2222
+:1111
 
 
 Pattern 5004
+# FIXME: Temporary workaround. With sufficient outer liberties it is
+# 
+# |.
+# |X
+# |XXX
+# +---
+# 
+# :2222
 
 |.
 |X
 |XXX
 +---
 
-:2222
+:1111
 
 
 Pattern 5005
@@ -829,30 +852,51 @@ Pattern 5010
 
 
 Pattern 5011
+# FIXME: Temporary workaround. With sufficient outer liberties it is
+# 
+# |X
+# |XXX.
+# +---
+# 
+# :2222
 
 |X
 |XXX.
 +---
 
-:2222
+:1111
 
 
 Pattern 5012
+# FIXME: Temporary workaround. With sufficient outer liberties it is
+# 
+# |.
+# |.X<.
+# +---
+# 
+# :1222
 
 |.
-|.X<.
+|.X*.
 +---
 
-:1222
+:1122
 
 
 Pattern 5013
+# FIXME: Temporary workaround. With sufficient outer liberties it is
+# 
+# |.
+# |.<X.
+# +---
+# 
+# :1222
 
 |.
-|.<X.
+|.*X.
 +---
 
-:1222
+:1122
 
 
 Pattern 5014
@@ -892,12 +936,19 @@ Pattern 5017
 
 
 Pattern 5018
+# FIXME: Temporary workaround. With sufficient outer liberties it is
+# 
+# |X
+# |XX..
+# +---
+# 
+# :2222
 
 |X
-|XX..
+|XX*.
 +---
 
-:2222
+:1122
 
 
 Pattern 5020
@@ -1841,6 +1892,17 @@ Pattern 5292
 #
 
 Pattern 5300
+# FIXME: Temporary workaround. With sufficient outer liberties it is
+#        covered by 5301.
+
+|XX
+|.XX
++---
+
+:1111
+
+
+Pattern 5301
 
 Xx
 xxX
@@ -1848,7 +1910,7 @@ xxX
 :2222
 
 
-Pattern 5301
+Pattern 5302
 
 xx
 x*x
@@ -1856,7 +1918,7 @@ x*x
 :1122
 
 
-Pattern 5302
+Pattern 5303
 
 x>
 >Xx
@@ -1864,7 +1926,7 @@ x>
 :1112
 
 
-Pattern 5303
+Pattern 5304
 
 >X
 XXX
@@ -1872,7 +1934,7 @@ XXX
 :1112
 
 
-Pattern 5304
+Pattern 5305
 
 xx
 xXx
@@ -5347,6 +5409,17 @@ X.X>
 :1112
 
 
+Pattern 64057
+# FIXME: Temporary workaround. With sufficient outer liberties it is
+# 2222.
+
+*X
+X.XX
+----
+
+:1122
+
+
 Pattern 64060
 
 .x
@@ -6083,12 +6156,19 @@ x)
 #
 
 Pattern 65000
+# FIXME: Temporary workaround. With sufficient outer liberties it is
+#
+# |...
+# |.<.
+# +---
+# 
+# :1222
 
-|...
-|.<.
+|.*.
+|.*.
 +---
 
-:1222
+:1122
 
 
 Pattern 65001
@@ -9946,7 +10026,7 @@ Pattern 74553
 Pattern 74554
 
  ..
-@..X.
+!*>X.
 -----
 
 :1122
@@ -11241,26 +11321,57 @@ X*X.
 
 
 Pattern 75505
-# X here gives ko.
+# FIXME: Temporary workaround. With sufficient outer liberties it is
+# # X here gives ko.
+# 
+# .<
+# X.X.
+#  x
+# 
+# :1222
 
-.<
+.*
 X.X.
  x
 
-:1222
+:1122
 
 
 Pattern 75506
-# X here gives ko.
+# FIXME: Temporary workaround. With sufficient outer liberties it is
+# # X here gives ko.
+# 
+# .X
+# X.<.
+#  x
+# 
+# :1222
 
 .X
-X.<.
+X.*.
  x
 
-:1222
+:1122
 
 
 Pattern 75507
+# FIXME: Temporary workaround. With sufficient outer liberties it is
+# # X here gives ko.
+# 
+# .X
+# <.X.
+#  x
+# 
+# :1222
+
+.X
+*.X.
+ x
+
+:1122
+
+
+Pattern 75508
 
 xX
 *XX.
@@ -11269,7 +11380,7 @@ xX
 :1122
 
 
-Pattern 75508
+Pattern 75509
 
 XX
 XXX>
@@ -11278,7 +11389,7 @@ XXX>
 :1112
 
 
-Pattern 75509
+Pattern 75510
 
 xX
 XXX.
@@ -11287,7 +11398,7 @@ XXX.
 :1111
 
 
-Pattern 75510
+Pattern 75511
 
 x<
 xXx.
diff --git a/patterns/owl_vital_apats.db b/patterns/owl_vital_apats.db
index 94c0d72..d3c84e6 100644
--- a/patterns/owl_vital_apats.db
+++ b/patterns/owl_vital_apats.db
@@ -1017,4 +1017,42 @@ OX.*
 ;owl_mineye(a)==1
 
 
+Pattern VA57
+# gf New pattern. (3.7.13)
+
+OXXXX   only one eye without outer liberties
+X.*.X
+X...X
+-----
+
+:8,s,value(75)
+
+OAAAA
+X...A
+X...A
+-----
+
+;lib(A)==4
+
+
+Pattern VA58
+# gf New pattern. (3.7.13)
+# See ld_owl:321.
+
+X..x   squeeze eyespace
+OX*.
+?X..
+----
+
+:8,s,value(35)
+
+X..x
+bA*.
+?A..
+----
+
+;lib(A)==3 && proper_eye(*) && owl_mineye(*) > 0 && owl_maxeye(*) > 1
+;&& !attack(b)
+
+
 # END OF FILE
diff --git a/patterns/patterns.db b/patterns/patterns.db
index 6ca543f..dc59a70 100644
--- a/patterns/patterns.db
+++ b/patterns/patterns.db
@@ -13903,6 +13903,44 @@ Pattern S16
 ;lib(a)==4 && seki_helper(a)
 
 
+Pattern S17
+# gf New pattern. (3.7.13)
+# 5 points gote seki. See seki:601.
+
+|XXX??
+|..XXX
+|.*..X
++-----
+
+:8,sXe,terri(5)
+
+|AAA??
+|..AAA
+|.*..A
++-----
+
+;lib(A)==4 && seki_helper(A)
+
+
+Pattern S18
+# gf New pattern. (3.7.13)
+# 5 points seki. Compare S17. See seki:602.
+
+|OOO??
+|..OOO
+|.*..O
++-----
+
+:8,sXe,terri(5)
+
+|aaa??
+|..aaa
+|.*..a
++-----
+
+;lib(a)==4 && seki_helper(a)
+
+
 ######################################################################
 #
 # High handicap patterns.