Changed some stuff for prod.