Graph fixes