DEP-89 [DEP-105]

Slight behavior corrections after the meeting with future users of this
node.