diff --git a/src/cfgfile.c b/src/cfgfile.c
index 6f4b0e0..c56a20c 100644
--- a/src/cfgfile.c
+++ b/src/cfgfile.c
@@ -365,15 +365,15 @@ int read_cfgfile(char *f, struct cfgcmd *cmds)
 			tmp_file = fopen("/etc/gnuais.conf","r");	
 			ret = 0;
 			if(tmp_file == NULL){
-				tmp_file = fopen("/usr/local/share/doc/gnuais/gnuais.conf-example","r");	
+				tmp_file = fopen("/usr/local/share/doc/gnuais/gnuais.conf-example","r");
 				if(tmp_file == NULL){
-					tmp_file = fopen("/usr/share/doc/gnuais/gnuais.conf-example","r");	
+					tmp_file = fopen("/usr/share/doc/gnuais/examples/gnuais.conf-example","r");
 					if(tmp_file == NULL){
 						hlog(LOG_ERR,"No gnuais.conf-example found to be copied to ~/.config/gnuais/config");
 					}
 					else {
 						hlog(LOG_NOTICE, "Using gnuais.conf-example as a starting point for ~/.config/gnuais/config...");
-						ret = cpfile(conf_home_folder,"/usr/share/doc/gnuais/gnuais.conf-example");
+						ret = cpfile(conf_home_folder,"/usr/share/doc/gnuais/examples/gnuais.conf-example");
 						if(ret == -1) hlog(LOG_ERR, "Could not copy configuration file to the home folder");
 						else hlog(LOG_NOTICE, "DONE creating configuration file (~/.config/gnuais/config). You should edit this file manually!");
 					}
diff --git a/src/filter-i386.h b/src/filter-i386.h
index 4b4fbf5..afdc645 100644
--- a/src/filter-i386.h
+++ b/src/filter-i386.h
@@ -32,10 +32,7 @@
 
 #include <stdio.h>
 
-#ifdef __GNUC_STDC_INLINE__
-__attribute__ ((gnu_inline))
-#endif
-extern inline float __mac_g(const float *a, const float *b,
+__attribute__ ((gnu_inline)) extern inline float __mac_g(const float *a, const float *b,
 			    unsigned int size)
 {
 	float sum = 0;
@@ -46,10 +43,7 @@ extern inline float __mac_g(const float *a, const float *b,
 	return sum;
 }
 
-#ifdef __GNUC_STDC_INLINE__
-__attribute__ ((gnu_inline))
-#endif
-extern inline float __mac_c(const float *a, const float *b,
+__attribute__ ((gnu_inline)) extern inline float __mac_c(const float *a, const float *b,
 			    unsigned int size)
 {
 	float f;
diff --git a/src/gui/gui.c b/src/gui/gui.c
index 7f2082d..d801ff7 100644
--- a/src/gui/gui.c
+++ b/src/gui/gui.c
@@ -540,7 +540,9 @@ int main(int argc, char **argv)
 	//				      (scrolled_window),
 	//				      drawing_area);
 	//osmmap = osm_gps_map_new ();
-    osmmap = g_object_new (OSM_TYPE_GPS_MAP,
+        osmmap = g_object_new (OSM_TYPE_GPS_MAP,
+			"map-source", OSM_GPS_MAP_SOURCE_OPENSTREETMAP,
+			"user-agent", "GnuAIS",
                         NULL);
 	// <-- End workaround
 	int tmp;
diff --git a/src/out_mysql.h b/src/out_mysql.h
index 967fa1d..48f925e 100644
--- a/src/out_mysql.h
+++ b/src/out_mysql.h
@@ -1,4 +1,3 @@
-
 /*
  *	out_mysql.h
  *
@@ -20,6 +19,8 @@
  *    along with this program; if not, write to the Free Software
  *    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
+#ifndef OUT_MYSQL_H
+#define OUT_MYSQL_H
 
 #include <time.h>
 #ifdef HAVE_MYSQL
@@ -32,7 +33,9 @@ struct mysql_state_t {
 	int connected;
 	int inserts;
 #endif
-} *my;
+};
+
+extern struct mysql_state_t *my;
 
 extern struct mysql_state_t *myout_init();
 
@@ -55,3 +58,4 @@ extern int myout_ais_vesseldatab(struct mysql_state_t *my,
 
 extern int myout_nmea(struct mysql_state_t *my, time_t tid, char *nmea);
 
+#endif /* OUT_MYSQL_H */