diff --git a/src/Makefile.am b/src/Makefile.am
index ef372ad86237550df26d324a8be550be29c8eed8..11f477f72c84f4f46682a41a059b51a851aca77f 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -4,11 +4,11 @@ AM_CPPFLAGS = -I$(abs_top_srcdir)/inc/ -I$(abs_top_builddir)/inc/
 ## LIBRARIES ##
 ###############
 
-lib_LTLIBRARIES = liblektor.la
 if LKT_STATIC_MODULE
 noinst_LTLIBRARIES = liblktmodsdl.la liblktmodrepo.la
+lib_LTLIBRARIES    = liblektor.la
 else
-lib_LTLIBRARIES += liblktmodsdl.la liblktmodrepo.la
+lib_LTLIBRARIES    = liblktmodsdl.la liblktmodrepo.la liblektor.la
 endif
 
 ## REPO module
@@ -23,7 +23,7 @@ endif
 
 ## SDL2 module
 liblktmodsdl_la_SOURCES = module/module_sdl2.c module/mpv.c
-liblktmodsdl_la_CFLAGS  = -fPIC `/usr/bin/sdl2-config --cflags`
+liblktmodsdl_la_CFLAGS  = -fPIC `sdl2-config --cflags`
 liblktmodsdl_la_LDFLAGS = -avoid-version -pthread -lmpv
 liblktmodsdl_la_LIBADD  = -lSDL2 -lmpv
 if LKT_STATIC_MODULE
diff --git a/src/Makefile.in b/src/Makefile.in
index 434d4c8f9a32fbcefe464eedb0e0887b000db7e1..94c2556c46e9ca77494e2019fa517ec21ff7d15a 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -89,12 +89,11 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
-@LKT_STATIC_MODULE_FALSE@am__append_1 = liblktmodsdl.la liblktmodrepo.la
-@LKT_STATIC_MODULE_TRUE@am__append_2 = -static
-@LKT_STATIC_MODULE_FALSE@am__append_3 = -shared
-@LKT_STATIC_MODULE_TRUE@am__append_4 = -static
-@LKT_STATIC_MODULE_FALSE@am__append_5 = -shared
-@LKT_STATIC_MODULE_TRUE@am__append_6 = -lSDL2 -lmpv
+@LKT_STATIC_MODULE_TRUE@am__append_1 = -static
+@LKT_STATIC_MODULE_FALSE@am__append_2 = -shared
+@LKT_STATIC_MODULE_TRUE@am__append_3 = -static
+@LKT_STATIC_MODULE_FALSE@am__append_4 = -shared
+@LKT_STATIC_MODULE_TRUE@am__append_5 = -lSDL2 -lmpv
 bin_PROGRAMS = lektord$(EXEEXT) lkt$(EXEEXT)
 subdir = src
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -167,6 +166,8 @@ am__v_lt_1 =
 liblektor_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(liblektor_la_CFLAGS) \
 	$(CFLAGS) $(liblektor_la_LDFLAGS) $(LDFLAGS) -o $@
+@LKT_STATIC_MODULE_FALSE@am_liblektor_la_rpath = -rpath $(libdir)
+@LKT_STATIC_MODULE_TRUE@am_liblektor_la_rpath = -rpath $(libdir)
 liblktmodrepo_la_LIBADD =
 am_liblktmodrepo_la_OBJECTS = module/liblktmodrepo_la-module_repo.lo \
 	module/liblktmodrepo_la-worker.lo
@@ -421,16 +422,17 @@ AM_CPPFLAGS = -I$(abs_top_srcdir)/inc/ -I$(abs_top_builddir)/inc/
 
 ###############
 ###############
-lib_LTLIBRARIES = liblektor.la $(am__append_1)
 @LKT_STATIC_MODULE_TRUE@noinst_LTLIBRARIES = liblktmodsdl.la liblktmodrepo.la
+@LKT_STATIC_MODULE_FALSE@lib_LTLIBRARIES = liblktmodsdl.la liblktmodrepo.la liblektor.la
+@LKT_STATIC_MODULE_TRUE@lib_LTLIBRARIES = liblektor.la
 liblktmodrepo_la_SOURCES = module/module_repo.c module/worker.c
 liblktmodrepo_la_CFLAGS = -fPIC
-liblktmodrepo_la_LDFLAGS = -avoid-version -pthread $(am__append_2) \
-	$(am__append_3)
+liblktmodrepo_la_LDFLAGS = -avoid-version -pthread $(am__append_1) \
+	$(am__append_2)
 liblktmodsdl_la_SOURCES = module/module_sdl2.c module/mpv.c
-liblktmodsdl_la_CFLAGS = -fPIC `/usr/bin/sdl2-config --cflags`
+liblktmodsdl_la_CFLAGS = -fPIC `sdl2-config --cflags`
 liblktmodsdl_la_LDFLAGS = -avoid-version -pthread -lmpv \
-	$(am__append_4) $(am__append_5)
+	$(am__append_3) $(am__append_4)
 liblktmodsdl_la_LIBADD = -lSDL2 -lmpv
 
 # Base sources
@@ -452,7 +454,7 @@ liblektor_la_SOURCES = base/bufferfd.c base/cmd.c base/common.c \
 # Liblektor configuration
 liblektor_la_CFLAGS = -fPIC
 liblektor_la_LDFLAGS = -avoid-version -shared -pthread -ljson-c \
-	-lsqlite3 -lcurl $(am__append_6)
+	-lsqlite3 -lcurl $(am__append_5)
 @LKT_STATIC_MODULE_TRUE@liblektor_la_LIBADD = liblktmodsdl.la liblktmodrepo.la
 CLEANFILES = database/disk.c database/memory.c
 EXTRA_DIST = database/disk.sql database/memory.sql
@@ -681,7 +683,7 @@ net/liblektor_la-message.lo: net/$(am__dirstamp) \
 	net/$(DEPDIR)/$(am__dirstamp)
 
 liblektor.la: $(liblektor_la_OBJECTS) $(liblektor_la_DEPENDENCIES) $(EXTRA_liblektor_la_DEPENDENCIES) 
-	$(AM_V_CCLD)$(liblektor_la_LINK) -rpath $(libdir) $(liblektor_la_OBJECTS) $(liblektor_la_LIBADD) $(LIBS)
+	$(AM_V_CCLD)$(liblektor_la_LINK) $(am_liblektor_la_rpath) $(liblektor_la_OBJECTS) $(liblektor_la_LIBADD) $(LIBS)
 module/$(am__dirstamp):
 	@$(MKDIR_P) module
 	@: > module/$(am__dirstamp)
diff --git a/src/base/common.c b/src/base/common.c
index d1a7694be53ec0d686431b509cc13df71604a3a6..e0f662560e854454c9ea248930b0a15e816ea152 100644
--- a/src/base/common.c
+++ b/src/base/common.c
@@ -19,7 +19,7 @@ __lkt_log(enum log_level level, const char *section, const char *func, const cha
     if (level <= log_level) {
         safe_snprintf(line, LKT_MESSAGE_MAX, " %c [%s] %s: %s\n",
                       level == ERROR ? '!' : level == WARN ? '*' : level == INFO ? '.' : ' ',
-                      section, __func__, format);
+                      section, func, format);
         va_start(ap, format);
         vfprintf(stderr, line, ap);
         va_end(ap);