NGLC - Minor bug fixes.
Merge remote-tracking branch 'origin/NGLC-experiments' into NGLC-experiments