Fixed some GraphCanvas issues