diff --git a/Makefile b/Makefile
index e5de6460..d5616810 100644
--- a/Makefile
+++ b/Makefile
@@ -201,12 +201,12 @@ AUTOMAKE = ${SHELL} /home/coppro/C++/MSE/trunk/missing --run automake-1.9
 AWK = mawk
 CC = gcc
 CCDEPMODE = depmode=gcc3
-CFLAGS = -g3 -O0
+CFLAGS = -g -O2
 CPP = gcc -E
 CPPFLAGS = 
 CXX = g++
 CXXDEPMODE = depmode=gcc3
-CXXFLAGS = -g3 -O0
+CXXFLAGS = -g -O2
 CYGPATH_W = echo
 DEFS = -DHAVE_CONFIG_H
 DEPDIR = .deps
diff --git a/src/gui/welcome_window.cpp b/src/gui/welcome_window.cpp
index 0e9009e2..c9e8e179 100644
--- a/src/gui/welcome_window.cpp
+++ b/src/gui/welcome_window.cpp
@@ -114,11 +114,10 @@ HoverButtonExt::HoverButtonExt(Window* parent, int id, const wxImage& icon, cons
 {}
 
 void HoverButtonExt::draw(DC& dc) {
-	handle_error(Error(_("HEYA")));
 	// draw button
 	HoverButton::draw(dc);
 	// icon
-	if (icon.Ok()) dc.DrawBitmap(icon, 7, 7); else handle_error(Error(_("Error drawing button bitmaps")));
+	if (icon.Ok()) dc.DrawBitmap(icon, 7, 7);
 	// text
 	dc.SetTextForeground(*wxBLACK);
 	dc.SetFont(font_large);