nm-vpnc.desktop.in                    |    6 ++----
 properties/tests/Makefile.am          |    4 ++--
 properties/tests/test-import-export.c |    4 ++--
 3 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/nm-vpnc.desktop.in b/nm-vpnc.desktop.in
index b9a6e5c..659a5a1 100644
--- a/nm-vpnc.desktop.in
+++ b/nm-vpnc.desktop.in
@@ -1,5 +1,4 @@
 [Desktop Entry]
-Encoding=UTF-8
 _Name=VPN Connection Manager (vpnc)
 _GenericName=VPN Connection Manager (vpnc)
 _Comment=Add, Remove, and Edit VPN Connections
@@ -7,7 +6,6 @@ Exec=nm-vpn-properties --import-service org.freedesktop.NetworkManager.vpnc --im
 Icon=gnome-mime-application-x-cisco-vpn-settings
 Terminal=false
 Type=Application
-DocPath=
-Categories=GNOME;Application;Network;
-MimeType=application/x-cisco-vpn-settings
+Categories=GNOME;Network;
+MimeType=application/x-cisco-vpn-settings;
 NoDisplay=true
diff --git a/properties/tests/Makefile.am b/properties/tests/Makefile.am
index 641b8cd..5f205d3 100644
--- a/properties/tests/Makefile.am
+++ b/properties/tests/Makefile.am
@@ -17,14 +17,14 @@ test_import_export_CPPFLAGS = \
 	$(DBUS_CFLAGS)
 
 test_import_export_LDADD = \
+	$(top_builddir)/properties/libnm-vpnc-properties.la \
 	$(GTHREAD_LIBS) \
 	$(GLADE_LIBS) \
 	$(GTK_LIBS) \
 	$(GCONF_LIBS) \
 	$(GNOMEKEYRING_LIBS) \
 	$(DBUS_LIBS) \
-	$(NM_UTILS_LIBS) \
-	$(top_builddir)/properties/libnm-vpnc-properties.la
+	$(NM_UTILS_LIBS)
 
 if WITH_TESTS
 
diff --git a/properties/tests/test-import-export.c b/properties/tests/test-import-export.c
index 3cefd79..38b851d 100644
--- a/properties/tests/test-import-export.c
+++ b/properties/tests/test-import-export.c
@@ -141,7 +141,7 @@ test_basic_import (NMVpnPluginUiInterface *plugin, const char *dir)
 	const char *expected_route1_gw = "0.0.0.0";
 	const char *expected_route2_dest = "172.16.0.0";
 	const char *expected_route2_gw = "0.0.0.0";
-	const char *value;
+//	const char *value;
 
 	connection = get_basic_connection ("basic-import", plugin, dir, "basic.pcf");
 	ASSERT (connection != NULL, "basic-import", "failed to import connection");
@@ -311,7 +311,7 @@ test_everything_via_vpn (NMVpnPluginUiInterface *plugin, const char *dir)
 	GError *error = NULL;
 	char *pcf;
 	const char *expected_id = "All your traffic are belong to VPN";
-	const char *value;
+//	const char *value;
 
 	pcf = g_build_path ("/", dir, "everything-via-vpn.pcf", NULL);
 	ASSERT (pcf != NULL,