Several speed improvements