fix some issues identified in comparing hybrid to our tree