Graph fixes

Various compatibility fixes.