Fixes to PotionEffect stuff