more fixes for faster perf