Fix a couple of ganglia specific bugs