fixes from actual usage in prod