Graph cleanups/fixes