More speedups