diff --git a/ChangeLog b/ChangeLog
index 579d8021..65c90cb3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -8,6 +8,9 @@ Changes since version 0.92.0:
 - fixed gcc-4 compilation issues (Vladimir Nadvornik <nadvornik@suse.cz>)
 - fixed amd64 compilation issues (Vladimir Nadvornik <nadvornik@suse.cz>)
 - eliminated gcc-4 compilation warnings
+- small fix for compilation in a different directory than the source
+  (Balaton Zoltan <balaton@eik.bme.hu>)
+- fixed some warnings on 64bit platforms (Balaton Zoltan <balaton@eik.bme.hu>)
 
 
 Changes since version 0.91.0:
diff --git a/WINGs/wbrowser.c b/WINGs/wbrowser.c
index 9b22abd8..c027786b 100644
--- a/WINGs/wbrowser.c
+++ b/WINGs/wbrowser.c
@@ -188,7 +188,7 @@ WMSetBrowserMaxVisibleColumns(WMBrowser *bPtr, int columns)
     int curMaxVisibleColumns;
     int newFirstVisibleColumn = 0;
 
-    assert ((int) bPtr);
+    assert (bPtr != NULL);
 
     columns = (columns < MIN_VISIBLE_COLUMNS) ? MIN_VISIBLE_COLUMNS : columns;
     columns = (columns > MAX_VISIBLE_COLUMNS) ? MAX_VISIBLE_COLUMNS : columns;
@@ -324,7 +324,7 @@ removeColumn(WMBrowser *bPtr, int column)
     WMList **clist;
     char **tlist;
 
-    assert ((int) bPtr);
+    assert (bPtr != NULL);
 
     column = (column < 0) ? 0 : column;
     if (column >= bPtr->columnCount) {
diff --git a/WINGs/wtext.c b/WINGs/wtext.c
index 3ace1d07..cb360b1a 100644
--- a/WINGs/wtext.c
+++ b/WINGs/wtext.c
@@ -1969,7 +1969,7 @@ deleteTextInteractively(Text *tPtr, KeySym ksym)
         } else if(tb->used == 0) {
             tb->blank = 1;
         } else if(tb->graphic) {
-            Bool hasNext = (Bool)(tb->next);
+            Bool hasNext = (tb->next != NULL);
 
             WMDestroyTextBlock(tPtr, WMRemoveTextBlock(tPtr));
             if(hasNext) {
diff --git a/wrlib/tests/Makefile.am b/wrlib/tests/Makefile.am
index b854c139..0ed8e8ac 100644
--- a/wrlib/tests/Makefile.am
+++ b/wrlib/tests/Makefile.am
@@ -6,7 +6,7 @@ noinst_PROGRAMS = testdraw testgrad testrot view
 
 EXTRA_DIST = test.png tile.xpm ballot_box.xpm 
 
-INCLUDES = -I.. $(DFLAGS) @HEADER_SEARCH_PATH@
+INCLUDES = -I$(srcdir)/.. $(DFLAGS) @HEADER_SEARCH_PATH@
 
 LIBLIST = $(top_builddir)/wrlib/libwraster.la