Document PRs #171 and #163