Minor efficiency tweaks