Clean up more munin bugs