diff --git a/WINGs/Makefile.am b/WINGs/Makefile.am
index 3e41b2ef..8ee5c3db 100644
--- a/WINGs/Makefile.am
+++ b/WINGs/Makefile.am
@@ -45,7 +45,7 @@ testcolorpanel_LDADD = libWINGs.a $(LIBLIST)
 
 testnot_SOURCES = testnot.c
 
-testnot_LDADD = libWUtil.a @LIBPL@
+testnot_LDADD = libWUtil.a @LIBRARY_SEARCH_PATH@ @LIBPL@
 
 
 wmquery_SOURCES = wmquery.c 
diff --git a/WINGs/Makefile.in b/WINGs/Makefile.in
index 9ee51ada..a803b0cd 100644
--- a/WINGs/Makefile.in
+++ b/WINGs/Makefile.in
@@ -131,7 +131,7 @@ testcolorpanel_LDADD = libWINGs.a $(LIBLIST)
 
 testnot_SOURCES = testnot.c
 
-testnot_LDADD = libWUtil.a @LIBPL@
+testnot_LDADD = libWUtil.a @LIBRARY_SEARCH_PATH@ @LIBPL@
 
 wmquery_SOURCES = wmquery.c 
 
diff --git a/WindowMaker/IconSets/Makefile.am b/WindowMaker/IconSets/Makefile.am
index f773ada4..afc789a2 100644
--- a/WindowMaker/IconSets/Makefile.am
+++ b/WindowMaker/IconSets/Makefile.am
@@ -9,7 +9,9 @@ CLEANFILES = Default.iconset
 
 Default.iconset: $(top_srcdir)/WindowMaker/Defaults/WMWindowAttributes
 	-rm -f Default.iconset
-	grep Icon $(top_srcdir)/WindowMaker/Defaults/WMWindowAttributes > Default.iconset
+	echo '{' > Default.iconset
+	grep Icon $(top_srcdir)/WindowMaker/Defaults/WMWindowAttributes >> Default.iconset
+	echo '}' >> Default.iconset
 	chmod 644 Default.iconset
 
 
diff --git a/WindowMaker/IconSets/Makefile.in b/WindowMaker/IconSets/Makefile.in
index adc00954..61ba62c4 100755
--- a/WindowMaker/IconSets/Makefile.in
+++ b/WindowMaker/IconSets/Makefile.in
@@ -221,7 +221,9 @@ maintainer-clean-generic clean mostlyclean distclean maintainer-clean
 
 Default.iconset: $(top_srcdir)/WindowMaker/Defaults/WMWindowAttributes
 	-rm -f Default.iconset
-	grep Icon $(top_srcdir)/WindowMaker/Defaults/WMWindowAttributes > Default.iconset
+	echo '{' > Default.iconset
+	grep Icon $(top_srcdir)/WindowMaker/Defaults/WMWindowAttributes >> Default.iconset
+	echo '}' >> Default.iconset
 	chmod 644 Default.iconset
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --git a/src/client.c b/src/client.c
index b3353ed8..4e0d0a05 100644
--- a/src/client.c
+++ b/src/client.c
@@ -718,12 +718,8 @@ wClientGetNormalHints(WWindow *wwin, XWindowAttributes *wattribs, Bool geometry,
 #ifdef IGNORE_PPOSITION
     wwin->normal_hints->flags &= ~PPosition;
 #endif
-#if 0
-    /* this seems obsoleted. Now geometry is taken from XGetWindowAttributes()
-     * in XGetNormalHints() we only have the hints themselves.
-     * check this. --Dan
-     */
-    if (/* check this !pre_icccm && */!wwin->screen_ptr->flags.startup && geometry) {
+
+    if (pre_icccm && !wwin->screen_ptr->flags.startup && geometry) {
 	if (wwin->normal_hints->flags & (USPosition|PPosition)) {
 	    *x = wwin->normal_hints->x;
 	    *y = wwin->normal_hints->y;
@@ -733,7 +729,6 @@ wClientGetNormalHints(WWindow *wwin, XWindowAttributes *wattribs, Bool geometry,
 	    *height = wwin->normal_hints->height;
 	}
     }
-#endif
 }