Fix and improve potion effect related stuff