Even more env_prod stuff