Fix bugs introduced with unified nodes changes