NULLORE: beginning: Minor bug fixes

Minor bug fixes