production setting fixes