Price calc fixes