NULLORE: beginning: Fix small bugs.

Fix small bugs.