Minor fixes related to mana.