Minor edits. Imported from primary_node modifications.