add nb5 specific fixups (#5355)