Ezp 23048

two small fixes. hope i'm doing the pr right