Cleanup.
Fix compilation of NULL