Fix remaining potion data values

Fixes #1844