Production deployment fixes