Minor speedups