Improve compatibility with newer automake
Fix admin perf counters on OS X