A few more performance tweaks