Fix merge issue with upstream updates