Changed some database stuffs for production