Some fixes to work on production