diff --git a/src/applets/wpa_supplicant.c b/src/applets/wpa_supplicant.c
index bde1e68..8da117b 100644
--- a/src/applets/wpa_supplicant.c
+++ b/src/applets/wpa_supplicant.c
@@ -285,7 +285,8 @@ static WPA * _wpa_init(PanelAppletHelper * helper, GtkWidget ** widget)
 	_wpa_start(wpa);
 	gtk_widget_show_all(hbox);
 	pango_font_description_free(bold);
-	if(panel_window_get_type(helper->window)
+	if(helper->window == NULL
+			|| panel_window_get_type(helper->window)
 			== PANEL_WINDOW_TYPE_NOTIFICATION)
 		wpa->widget = hbox;
 	else
@@ -397,7 +398,9 @@ static void _wpa_set_status(WPA * wpa, gboolean connected, gboolean associated,
 	fprintf(stderr, "DEBUG: %s(%u, %u, \"%s\")\n", __func__, connected,
 			associated, network);
 #endif
-	iconsize = panel_window_get_icon_size(wpa->helper->window);
+	iconsize = (wpa->helper->window != NULL)
+		? panel_window_get_icon_size(wpa->helper->window)
+		: GTK_ICON_SIZE_SMALL_TOOLBAR;
 	gtk_icon_size_lookup(iconsize, &size, &size);
 	if(connected == FALSE && network == NULL)
 	{
diff --git a/src/project.conf b/src/project.conf
index 967f354..1436ace 100644
--- a/src/project.conf
+++ b/src/project.conf
@@ -1,14 +1,14 @@
 targets=libPanel,panel,panelctl,run
 #cppflags=-D EMBEDDED
-cflags_force=-W
-cflags=-Wall -g -O2 -pedantic -fPIC -fstack-protector
+cflags=-W -Wall -g -O2 -pedantic -D_FORTIFY_SOURCE=2 -fstack-protector-all
+ldflags_force=-Wl,-z,relro -Wl,-z,now
 dist=Makefile,helper.c,panel.h,window.h
 
 [libPanel]
 type=library
 sources=panel.c,window.c
 cppflags=-D PREFIX=\"$(PREFIX)\"
-cflags=`pkg-config --cflags libDesktop`
+cflags=`pkg-config --cflags libDesktop` -fPIC
 ldflags=`pkg-config --libs libDesktop` -lintl
 install=$(LIBDIR)
 
@@ -17,8 +17,8 @@ type=binary
 depends=$(OBJDIR)libPanel.a
 sources=main.c
 cppflags=-D PREFIX=\"$(PREFIX)\"
-cflags=`pkg-config --cflags libDesktop`
-ldflags=`pkg-config --libs libDesktop` -lintl -L. -L$(OBJDIR). -Wl,-rpath,$(LIBDIR) -lPanel -Wl,-pie
+cflags=`pkg-config --cflags libDesktop` -fPIE
+ldflags=`pkg-config --libs libDesktop` -lintl -L$(OBJDIR). -Wl,-rpath,$(LIBDIR) -lPanel -Wl,-pie
 install=$(BINDIR)
 
 [main.c]
@@ -33,7 +33,7 @@ depends=../include/Panel.h,panel.h,window.h
 [panelctl]
 type=binary
 sources=panelctl.c
-cflags=`pkg-config --cflags libDesktop`
+cflags=`pkg-config --cflags libDesktop` -fPIE
 ldflags=`pkg-config --libs libDesktop` -lintl -Wl,-pie
 install=$(BINDIR)
 
@@ -44,7 +44,7 @@ depends=../include/Panel.h,panel.h,../config.h
 type=binary
 sources=run.c
 cppflags=-D PREFIX=\"$(PREFIX)\"
-cflags=`pkg-config --cflags libSystem gtk+-2.0`
+cflags=`pkg-config --cflags libSystem gtk+-2.0` -fPIE
 ldflags=`pkg-config --libs libSystem gtk+-2.0` -lintl -Wl,-pie
 #for Gtk+ 3
 #cflags=`pkg-config --cflags libSystem gtk+-3.0`
diff --git a/tests/project.conf b/tests/project.conf
index ea03418..1feb417 100644
--- a/tests/project.conf
+++ b/tests/project.conf
@@ -1,9 +1,9 @@
 targets=applets,applets2,tests.log
 cppflags_force=-I ../include
-cflags_force=-W `pkg-config --cflags libDesktop`
-cflags=-Wall -g -O2 -pedantic -fPIC -fstack-protector
-ldflags_force=-W `pkg-config --libs libDesktop`
-ldflags=-Wl,-pie
+cflags_force=`pkg-config --cflags libDesktop`
+cflags=-W -Wall -g -O2 -pedantic -fPIE -D_FORTIFY_SOURCE=2 -fstack-protector-all
+ldflags_force=`pkg-config --libs libDesktop`
+ldflags=-Wl,-pie -Wl,-z,relro -Wl,-z,now
 dist=Makefile,tests.sh
 
 [applets]
diff --git a/tools/project.conf b/tools/project.conf
index afd4277..0b1ab05 100644
--- a/tools/project.conf
+++ b/tools/project.conf
@@ -1,8 +1,8 @@
 targets=panel-embed,panel-message,panel-notify,panel-test,settings,wifibrowser
-cflags_force=-W `pkg-config --cflags libDesktop`
-cflags=-Wall -g -O2 -pedantic -fPIC -fstack-protector
+cflags_force=`pkg-config --cflags libDesktop`
+cflags=-W -Wall -g -O2 -pedantic -fPIE -D_FORTIFY_SOURCE=2 -fstack-protector-all
 ldflags_force=`pkg-config --libs libDesktop`
-ldflags=-Wl,-pie
+ldflags=-Wl,-pie -Wl,-z,relro -Wl,-z,now
 dist=Makefile,helper.c
 
 [panel-embed]