A few more graph tweaks