Fixes for nullrefs.