More HealthBars compatibility and bug fixes
Fixing Merge