Cleanup some issues with exec Upstream-commit: cc411c054ffc16fff1ec27b49047ff7dba6a1e04 Component: engine