Graph generation fixes