A couple minor tweaks for system performance