diff --git a/README.md b/README.md
index fe29cda..c0398bc 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,9 @@ Created originally as part of PW3270 application.
 
 See more details at https://softwarepublico.gov.br/social/pw3270/
 
+[![License: GPL v3](https://img.shields.io/badge/License-GPL%20v3-blue.svg)](https://www.gnu.org/licenses/gpl-3.0)
 ![CodeQL](https://github.com/PerryWerneck/libv3270/workflows/CodeQL/badge.svg?branch=master)
+![Analytics](https://ga-beacon.appspot.com/G-RSMGQ9Q5BG/github/libv3270)
 ![Downloads](https://img.shields.io/github/downloads/PerryWerneck/libv3270/total.svg)
 
 
diff --git a/autogen.sh b/autogen.sh
index 0de9751..8eea9b1 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -6,21 +6,33 @@ test -n "$srcdir" || srcdir=.
 olddir=`pwd`
 cd "$srcdir"
 
+mkdir -p scripts
 mkdir -p m4
 
+libtoolize --force
+if test $? != 0 ; then
+	echo "libtoolize failed."
+	exit -1
+fi
+
 aclocal
 if test $? != 0 ; then
 	echo "aclocal failed."
 	exit -1
 fi
 
-autoconf
+#autoheader --force
+#if test $? != 0 ; then
+#	echo "autoheader failed."
+#	exit -1
+#fi
+
+autoconf --force
 if test $? != 0 ; then
 	echo "autoconf failed."
 	exit -1
 fi
 
-mkdir -p scripts
 automake --add-missing 2> /dev/null | true
 
 cd "$olddir"
diff --git a/src/terminal/drawing/oia.c b/src/terminal/drawing/oia.c
index f4dd271..d26c01f 100644
--- a/src/terminal/drawing/oia.c
+++ b/src/terminal/drawing/oia.c
@@ -731,7 +731,6 @@ void v3270_draw_oia(v3270 *terminal, cairo_t *cr, int row, int cols)
 	}
 
 	cairo_save(cr);
-//	v3270_draw_ssl_status(cr,terminal->host,&terminal->font,terminal->color,terminal->oia.rect+V3270_OIA_SSL);
 	v3270_draw_ssl_status(terminal,cr,terminal->oia.rect+V3270_OIA_SSL);
 	cairo_restore(cr);
 
@@ -762,12 +761,7 @@ cairo_t * v3270_oia_set_update_region(v3270 * terminal, GdkRectangle **r, V3270_
 
 	*r = rect;
 
-#ifdef DEBUG
-	cairo_set_source_rgb(cr,0.1,0.1,0.1);
-#else
 	gdk_cairo_set_source_rgba(cr,terminal->color+V3270_COLOR_OIA_BACKGROUND);
-#endif
-
 	cairo_rectangle(cr, rect->x, rect->y, rect->width, rect->height);
 	cairo_fill(cr);
 
@@ -802,19 +796,18 @@ gboolean v3270_update_associated_lu(v3270 *terminal)
 
 void v3270_update_message(v3270 *widget, LIB3270_MESSAGE id)
 {
-	cairo_t 		* cr;
-	GdkRectangle	* rect;
 
-	if(!widget->surface)
-		return;
+	if(widget->surface) {
 
-	cr = v3270_oia_set_update_region(widget,&rect,V3270_OIA_MESSAGE);
+		GdkRectangle	* rect;
+		cairo_t 		* cr	= v3270_oia_set_update_region(widget,&rect,V3270_OIA_MESSAGE);
 
-	draw_status_message(cr,id,&widget->font,widget->color,rect);
+		draw_status_message(cr,id,&widget->font,widget->color,rect);
+		cairo_destroy(cr);
 
-    cairo_destroy(cr);
+		v3270_queue_draw_area(GTK_WIDGET(widget),rect->x,rect->y,rect->width,rect->height);
 
-	v3270_queue_draw_area(GTK_WIDGET(widget),rect->x,rect->y,rect->width,rect->height);
+	}
 
 	if(widget->accessible)
 		v3270_acessible_set_state(widget->accessible,id);
--
libgit2 0.21.2