NULLORE: beginning: Fixing minor problems

Fixing minor problems