Improve perf watermarking
3 files changed