Some more tuning to unblock, mostly to integrate mass unblocking