[TASK] Small bugfix and CGL adjustment