A few more graph changes