diff --git a/res/gstencoder.vala b/res/gstencoder.vala
index 03d0bf2..a7060a4 100644
--- a/res/gstencoder.vala
+++ b/res/gstencoder.vala
@@ -320,8 +320,13 @@ internal class GstEncoder : DispdEncoder, GLib.Object
 		conn = yield Bus.get(BusType.SESSION);
 		conn.register_object(DispdEncoder.OBJECT_PATH, this as DispdEncoder);
 
+#if VALA_0_54
 		string bus_info = "%s\n%s".printf(conn.unique_name,
-						BusType.get_address_sync(BusType.SESSION));
+						BusType.SESSION.get_address_sync ());
+#else
+		string bus_info = "%s\n%s".printf(conn.unique_name,
+						BusType.SESSION.get_address_sync());
+#endif
 		/* we are ready, tell parent how to communicate with us */
 		ssize_t r = Posix.write(3, (void *) bus_info.data, bus_info.length);
 		if(0 > r) {
diff --git a/src/ctl/CMakeLists.txt b/src/ctl/CMakeLists.txt
index 096c9b0..c055a9c 100644
--- a/src/ctl/CMakeLists.txt
+++ b/src/ctl/CMakeLists.txt
@@ -3,8 +3,6 @@ pkg_check_modules (GLIB2 REQUIRED glib-2.0)
 link_directories( ${GLIB2_LIBRARY_DIRS})
 include_directories( ${GLIB2_INCLUDE_DIRS})
 find_package(Readline REQUIRED)
-pkg_check_modules (GLIB2 REQUIRED glib-2.0)
-########### next target ###############
 
 set(miracle-wifictl_SRCS ctl.h 
                          ctl-cli.c 
@@ -25,7 +23,6 @@ endif(READLINE_FOUND)
 
 target_link_libraries(miracle-wifictl miracle-shared)
 target_link_libraries(miracle-wifictl ${GLIB2_LIBRARIES})
-########### next target ###############
 
 set(miracle-sinkctl_SRCS ctl.h 
                          ctl-cli.c 
@@ -52,37 +49,3 @@ target_link_libraries(miracle-sinkctl miracle-shared)
 
 include_directories(${CMAKE_BINARY_DIR}
          ${CMAKE_SOURCE_DIR}/src ${CMAKE_SOURCE_DIR}/src/shared)
-
-#original Makefile.am contents follow:
-
-#include $(top_srcdir)/common.am
-#bin_PROGRAMS = miracle-wifictl miracle-sinkctl
-#
-#miracle_wifictl_SOURCES = \
-#	ctl.h \
-#	ctl-cli.c \
-#	ctl-wifi.c \
-#	wifictl.c
-#miracle_wifictl_CPPFLAGS = \
-#	$(AM_CPPFLAGS) \
-#	$(DEPS_CFLAGS)
-#miracle_wifictl_LDADD = \
-#	../shared/libmiracle-shared.la \
-#	-lreadline \
-#	$(DEPS_LIBS)
-#
-#miracle_sinkctl_SOURCES = \
-#	ctl.h \
-#	ctl-cli.c \
-#	ctl-sink.c \
-#	ctl-wifi.c \
-#	sinkctl.c
-#miracle_sinkctl_CPPFLAGS = \
-#	$(AM_CPPFLAGS) \
-#	$(DEPS_CFLAGS)
-#miracle_sinkctl_LDADD = \
-#	../shared/libmiracle-shared.la \
-#	-lreadline \
-#	$(DEPS_LIBS)
-#
-#
diff --git a/src/disp/CMakeLists.txt b/src/disp/CMakeLists.txt
index 63ef663..e62bdd2 100644
--- a/src/disp/CMakeLists.txt
+++ b/src/disp/CMakeLists.txt
@@ -1,3 +1,9 @@
+find_package(PkgConfig)
+pkg_check_modules (GLIB2 REQUIRED glib-2.0)
+link_directories( ${GLIB2_LIBRARY_DIRS})
+include_directories( ${GLIB2_INCLUDE_DIRS})
+find_package(Readline REQUIRED)
+
 set(miracle-dispd_SRCS
 				../ctl/ctl-cli.c
 				../ctl/ctl-wifi.c
@@ -18,6 +24,7 @@ include_directories(${CMAKE_SOURCE_DIR}/src/ctl
 )
 
 add_executable(miracle-dispd ${miracle-dispd_SRCS})
+target_link_libraries(miracle-dispd ${GLIB2_LIBRARIES})
 
 install(TARGETS miracle-dispd DESTINATION bin)