fixes from prod