Merge "Fixes to run in node, and in workspace"