Fixed a few merge conflicts that creeped in when the upstream merged changes.