Even more price fixes.
Merge pull request #7451 from Rivet-the-Zombie/even-more-prices-fixes

Even more price fixes.