Resolve marketplace semgrep findings

Resolves the marketplace Semgrep findings that blocked the check.