See #280.
Also added updates to buf, because they were somehow forgotten the last time we wanted to.
CLI shouldn't block for any paths for now, the fix is supposed to be temporary. Needs some further investigations in the future.
