Some changes in the code to run on production servers