Fix issues with watches; add perf