couple more speedup fixes