Speedup fixes