Fix docs after backport to 0.8