Fix merge errors from ba6ac8af7b