various perftool fixes