Fix merge conflicts that were missed on original merge from upstream/master