More fixes, including a NullRefEx