Fixes for munin compability