NGLC - Minor bug fixes.