More performance fixes.