Fix support for short node names