Fix merge errors from mainline