Changes for running on production