all: fix usage of some variables Upstream-commit: c9175a6deb70887afc757702a69bf750b9668fd4 Component: engine