More mana fixes