Changes needed to run in produciton