More tweaks for compatibility with other galera packaging