runtime: Update with path fixes, should fix tests