Bunch more speedups