GRIM: Convert a few more NULLs