Minor graph tweaks