Node Comment fixes