Contact list performance fixes. Minor fixes.