Aftermerge fixes