fixed issues with production deployment