Efficiency tweaks