Small tweaks

2 jobs for !697 with big-op-impl in 7 minutes and 47 seconds (queued for 4 seconds)
merge request