Gfx: Cosmetic tweaks