[TASK] Fix a few more CGL quirks