fixes to run on production