Tiny speed improvements