Bug fixes for Prod deployment

Many fixes. Deployed to production.