Fixed compile bugs introduced by last commit
Fixed NPE in match_node