Some changes to make sure it works with the production server.