Fixes for upmerge