Bugfixes for false node recording