WIP for graph fixes