Fixed Graph issues