diff --git a/modules/rhizo_base/files/collectd-hack b/modules/rhizo_base/files/collectd-hack
index 46800cd..22a490d 100644
--- a/modules/rhizo_base/files/collectd-hack
+++ b/modules/rhizo_base/files/collectd-hack
@@ -42,7 +42,7 @@ category_bsc() {
 
 category_bts() {
  _name=`bname $2 | tr [:space:] -`
- mkdir $1-$_name
+ mkdir $1-$_name || return
  cd $1-$_name
  for f in ../statsd/derive-bts.$2.$1.* ; do
    ln -s $f $1-`echo $f | awk -F'.' '{print $6}'`.rrd
@@ -52,7 +52,7 @@ category_bts() {
 
 category_bts_g() {
  _name=`bname $2 | tr [:space:] -`
- mkdir $1-$_name
+ mkdir $1-$_name || return
  cd $1-$_name
  for f in ../statsd/gauge-bts.$2.$1.* ; do
    ln -s $f $1-`echo $f | awk -F'.' '{print $6}'`.rrd
@@ -94,7 +94,7 @@ once() {
  rm -rf BTS_uptime-*
  for bts in "${!BTS[@]}" ; do
   _name=`bname $bts | tr [:space:] -`
-  mkdir BTS_uptime-$_name
+  mkdir BTS_uptime-$_name || exit
   cd BTS_uptime-$_name
   for f in ../statsd/gauge-bts.$bts.uptime.* ; do
     ln -s $f uptime-`echo $f | awk -F'.' '{print $6}'`.rrd
@@ -129,7 +129,7 @@ for f in statsd/* ; do
   debug $1 "Checking $f"
   is_empty $1 $f
   if [ $? == 1 ] ; then continue ; fi
-  mkdir $(basename $f .rrd)
+  mkdir $(basename $f .rrd) || exit
   cd $(basename $f .rrd)
   ln -s ../$f .
   cd ..
diff --git a/modules/rhizo_base/files/etc/collectd/collectd.conf b/modules/rhizo_base/files/etc/collectd/collectd.conf
index f9cb8b6..3246d34 100644
--- a/modules/rhizo_base/files/etc/collectd/collectd.conf
+++ b/modules/rhizo_base/files/etc/collectd/collectd.conf
@@ -91,7 +91,7 @@ LoadPlugin syslog
 #LoadPlugin apcups
 #LoadPlugin ascent
 #LoadPlugin barometer
-LoadPlugin battery
+#LoadPlugin battery
 #LoadPlugin bind
 #LoadPlugin ceph
 #LoadPlugin cgroups
@@ -113,14 +113,14 @@ LoadPlugin disk
 #LoadPlugin dpdkstat
 #LoadPlugin drbd
 #LoadPlugin email
-LoadPlugin entropy
+#LoadPlugin entropy
 #LoadPlugin ethstat
 #LoadPlugin exec
 #LoadPlugin fhcount
 #LoadPlugin filecount
 #LoadPlugin fscache
 #LoadPlugin gmond
-#LoadPlugin gps
+LoadPlugin gps
 #LoadPlugin hugepages
 #LoadPlugin grpc
 #LoadPlugin hddtemp
@@ -173,7 +173,7 @@ LoadPlugin processes
 #LoadPlugin redis
 #LoadPlugin rrdcached
 LoadPlugin rrdtool
-#LoadPlugin sensors
+LoadPlugin sensors
 #LoadPlugin serial
 #LoadPlugin sigrok
 #LoadPlugin smart
@@ -191,7 +191,7 @@ LoadPlugin swap
 #LoadPlugin tokyotyrant
 #LoadPlugin turbostat
 #LoadPlugin unixsock
-#LoadPlugin uptime
+LoadPlugin uptime
 LoadPlugin users
 #LoadPlugin uuid
 #LoadPlugin varnish
@@ -609,12 +609,12 @@ LoadPlugin users
 #	</Metric>
 #</Plugin>
 
-#<Plugin gps>
-#	Host "127.0.0.1"
-#	Port "2947"
-#	Timeout 0.015
-#	PauseConnect 5
-#</Plugin>
+<Plugin gps>
+	Host "172.16.0.11"
+	Port "2947"
+	Timeout 0.015
+	PauseConnect 5
+</Plugin>
 
 #<Plugin hddtemp>
 #	Host "127.0.0.1"