Deployment updates, email fix