Various tweaks for speed