Minor fixes.
Fixes and enhancements.
Fixing nullity by default.