diff --git a/Makefile b/Makefile
index 2446ce8..648dce9 100644
--- a/Makefile
+++ b/Makefile
@@ -7,14 +7,14 @@ PREFIX ?= /usr/local
 BINDIR ?= ${PREFIX}/bin
 MANPREFIX = ${PREFIX}/share/man
 
-INCS = -I.
+INCS = -I. -I${PREFIX}/include
 LIBS = -lc `pkg-config --libs xcb xcb-icccm xcb-keysyms`
 
 CPPFLAGS += -DVERSION=\"${VERSION}\" -DWMNAME=\"${WMNAME}\"
 
 DEBUG 	 = 0
-CFLAGS   += -std=c99 -pedantic -Wall -Wextra -Os ${INCS} ${CPPFLAGS} -DVERSION=\"${VERSION}\"
-LDFLAGS  += -s ${LIBS}
+CFLAGS   += -std=c99 -pedantic -Wall -Wextra -Os ${INCS} ${CPPFLAGS} -DVERSION=\"${VERSION}\" 
+LDFLAGS  += ${LIBS}
 
 EXEC = ${WMNAME}
 
@@ -23,7 +23,6 @@ OBJ = ${SRC:.c=.o}
 
 ifeq (${DEBUG},0)
    CFLAGS  += -Os
-   LDFLAGS += -s
 else
    CFLAGS  += -g
    LDFLAGS += -g
diff --git a/monsterwm.c b/monsterwm.c
index 127977f..c60a278 100644
--- a/monsterwm.c
+++ b/monsterwm.c
@@ -445,7 +445,7 @@ void configurerequest(xcb_generic_event_t *e) {
         unsigned int v[7];
         unsigned int i = 0;
         if (ev->value_mask & XCB_CONFIG_WINDOW_X)              v[i++] = ev->x;
-        if (ev->value_mask & XCB_CONFIG_WINDOW_Y)              v[i++] = ev->y + (showpanel && TOP_PANEL) ? PANEL_HEIGHT : 0;
+        if (ev->value_mask & XCB_CONFIG_WINDOW_Y)              v[i++] = (ev->y + (showpanel && TOP_PANEL)) ? PANEL_HEIGHT : 0;
         if (ev->value_mask & XCB_CONFIG_WINDOW_WIDTH)          v[i++] = (ev->width  < ww - BORDER_WIDTH) ? ev->width  : ww + BORDER_WIDTH;
         if (ev->value_mask & XCB_CONFIG_WINDOW_HEIGHT)         v[i++] = (ev->height < wh - BORDER_WIDTH) ? ev->height : wh + BORDER_WIDTH;
         if (ev->value_mask & XCB_CONFIG_WINDOW_BORDER_WIDTH)   v[i++] = ev->border_width;