Fixed Graph bugs