Fix missing NULL sentinels