(GL) Minor tweaks