More performance tweaks