Misc updates. (Repo sync.)