diff --git a/json-glib/configure.ac b/json-glib/configure.ac
index bc678ae..567716c 100644
--- a/json-glib/configure.ac
+++ b/json-glib/configure.ac
@@ -42,8 +42,8 @@ AM_PATH_GLIB_2_0
 AM_PROG_CC_C_O
 
 LT_PREREQ([2.2.6])
-LT_INIT([disable-shared])
-dnl LT_INIT([disable-static])
+dnl LT_INIT([disable-shared])
+LT_INIT([disable-static])
 
 # Honor aclocal flags
 ACLOCAL="$ACLOCAL $ACLOCAL_FLAGS"
diff --git a/json-glib/json-glib/Makefile.am b/json-glib/json-glib/Makefile.am
index 4120276..367ebf4 100644
--- a/json-glib/json-glib/Makefile.am
+++ b/json-glib/json-glib/Makefile.am
@@ -74,11 +74,11 @@ glib_marshal_list = json-marshal.list
 glib_marshal_prefix = _json_marshal
 include $(top_srcdir)/build/autotools/Makefile.am.marshal
 
-noinst_LTLIBRARIES = libjson-glib.la
+lib_LTLIBRARIES = libsearpc-json-glib.la
 
-libjson_glib_la_LIBADD = $(JSON_LIBS)
-libjson_glib_la_SOURCES = $(source_c) $(source_h) $(source_h_private) $(BUILT_SOURCES)
-libjson_glib_la_LDFLAGS = $(JSON_LT_LDFLAGS) -export-dynamic -export-symbols-regex "^json.*" -rpath $(libdir)
+libsearpc_json_glib_la_LIBADD = $(JSON_LIBS)
+libsearpc_json_glib_la_SOURCES = $(source_c) $(source_h) $(source_h_private) $(BUILT_SOURCES)
+libsearpc_json_glib_la_LDFLAGS = $(JSON_LT_LDFLAGS) -export-dynamic -export-symbols-regex "^json.*" -rpath $(libdir)
 
 jsonincludedir = $(includedir)/searpc/json-glib
 jsoninclude_DATA = \
diff --git a/json-glib/json-glib/tests/Makefile.am b/json-glib/json-glib/tests/Makefile.am
index 5d5f784..770b361 100644
--- a/json-glib/json-glib/tests/Makefile.am
+++ b/json-glib/json-glib/tests/Makefile.am
@@ -13,7 +13,7 @@ INCLUDES = \
 AM_CPPFLAGS = $(JSON_DEBUG_CFLAGS) -DTESTS_DATA_DIR=\""$(top_srcdir)/json-glib/tests"\"
 AM_CFLAGS = -g $(JSON_CFLAGS) $(MAINTAINER_CFLAGS)
 LDADD = \
-	../libjson-glib.la \
+	../libsearpc-json-glib.la \
 	$(JSON_LIBS) \
 	$(NULL)
 
diff --git a/lib/Makefile.am b/lib/Makefile.am
index d83b407..55ab041 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -40,7 +40,7 @@ libsearpc_la_SOURCES = searpc-client.c searpc-server.c $(generated_sources)
 libsearpc_la_LDFLAGS =  -version-info 1:1:0  -no-undefined
 
 libsearpc_la_LIBADD = @GLIB_LIBS@ \
-	${top_builddir}/json-glib/json-glib/libjson-glib.la
+	${top_builddir}/json-glib/json-glib/libsearpc-json-glib.la
 
 genrpc_files = gencode.py rpc_table.py
 
diff --git a/pysearpc/client.py b/pysearpc/client.py
index 3a16c21..0c04d40 100644
--- a/pysearpc/client.py
+++ b/pysearpc/client.py
@@ -97,7 +97,7 @@ def searpc_func(ret_type, param_types):
 
             return fret(ret_str)
 
-        if ret_obj_class:
+        if ret_type == "objlist" or ret_type == "object":
             return newfunc_obj
         else:
             return newfunc