More price fixes.
Merge pull request #7665 from Rivet-the-Zombie/even-more-fixes

More price fixes.