Some fixes for prod version