Fix potion related issues