Various graphs rendering fixes