fixed directory resolver and @this_node and @this_server tokens.