Fixed pricing and location issues