roll in fixes from production use