More migration guide fixes [skip-ci]