fix production readiness issues