More prices fixes.
Merge remote-tracking branch 'Rivet-the-Zombie/more-price-fixes' into FrankenMod