Wrap up last 2 commits.