NODE_PATH improvements