More '\0' -> NULL replacements to avoid clang warnings