General speed improvements