core: pickup unsupported entries after stats merge. few misc touchups.