Couple more performance tweaks ...