Fixes for better graph-agnosticism