Code tweaks and get_node_actions