fix: small fixes that were missed from a previous code review

fix: small fixes that were missed from a previous code review #5215