Small node and worker fixes