Change 0L to NULLs.
Other changes.