Handle potions better.
Fixing merge issues, again.