Add fixes for mana and health updates