Some speed-related changes